From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 19 Aug 2010 14:51:09 +0000 (+0800)
Subject: (w32_wnd_proc): Don't check context before initializing.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6908
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d6901d4041508fdb9a55d5480517fb8aedb5c78a;p=emacs.git

(w32_wnd_proc): Don't check context before initializing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 981c1c17266..908be916bf4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-19  Jason Rumney  <jasonr@gnu.org>
+
+	* w32fns.c (w32_wnd_proc): Don't check context before initializing.
+
 2010-08-19  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
diff --git a/src/w32fns.c b/src/w32fns.c
index 64d0d8cb6d1..f91ad948828 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3109,9 +3109,6 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	  HIMC context;
 	  struct window *w;
 
-	  if (!context)
-	    break;
-
 	  f = x_window_to_frame (dpyinfo, hwnd);
 	  w = XWINDOW (FRAME_SELECTED_WINDOW (f));
 
@@ -3129,6 +3126,10 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				- WINDOW_MODE_LINE_HEIGHT (w));
 
 	  context = get_ime_context_fn (hwnd);
+
+	  if (!context)
+	    break;
+
 	  set_ime_composition_window_fn (context, &form);
 	  release_ime_context_fn (hwnd, context);
 	}